Revert "ipv4/fib: send notify when delete source address routes"
This reverts commit d5ba30ee4f6d8fe47bf00a2368c62049abcb1d5c which is
commit 4b2b606075e50cdae62ab2356b0a1e206947c354 upstream.
It breaks the android ABI and if this is needed in the future, can be
brought back in an abi-safe way.
Bug: 161946584
Change-Id: I445b109db38243faa7154021212e3f7ca0ad820f
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
index 9f6e2a4..c3324a1 100644
--- a/include/net/ip_fib.h
+++ b/include/net/ip_fib.h
@@ -151,7 +151,6 @@
int fib_nhs;
bool fib_nh_is_v6;
bool nh_updated;
- bool pfsrc_removed;
struct nexthop *nh;
struct rcu_head rcu;
struct fib_nh fib_nh[];
diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
index 735901b..91a3d6d 100644
--- a/net/ipv4/fib_semantics.c
+++ b/net/ipv4/fib_semantics.c
@@ -1908,7 +1908,6 @@
continue;
if (fi->fib_prefsrc == local) {
fi->fib_flags |= RTNH_F_DEAD;
- fi->pfsrc_removed = true;
ret++;
}
}
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
index 0b74deb..22531aa 100644
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -2021,7 +2021,6 @@
int fib_table_flush(struct net *net, struct fib_table *tb, bool flush_all)
{
struct trie *t = (struct trie *)tb->tb_data;
- struct nl_info info = { .nl_net = net };
struct key_vector *pn = t->kv;
unsigned long cindex = 1;
struct hlist_node *tmp;
@@ -2084,9 +2083,6 @@
fib_notify_alias_delete(net, n->key, &n->leaf, fa,
NULL);
- if (fi->pfsrc_removed)
- rtmsg_fib(RTM_DELROUTE, htonl(n->key), fa,
- KEYLENGTH - fa->fa_slen, tb->tb_id, &info, 0);
hlist_del_rcu(&fa->fa_list);
fib_release_info(fa->fa_info);
alias_free_mem_rcu(fa);
